From: Florian Müllner <fmuellner@gnome.org>
Date: Thu, 8 Jul 2021 18:36:14 +0000 (+0200)
Subject: iconGrid: Disconnect signals on destroy
X-Git-Tag: archive/raspbian/50.5-1+rpi1~1^2~574^2^2~223
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=30e49cc3ca2c6cea07ace149eb7448f48dbb5d36;p=gnome-shell.git

iconGrid: Disconnect signals on destroy

Otherwise the handler will trip over unset properties on an object
that is being disposed. Avoid the resulting log spam by disconnecting
the handler in question.

Part-of: <https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/1909>
---

diff --git a/js/ui/iconGrid.js b/js/ui/iconGrid.js
index cdceb020d..efc638913 100644
--- a/js/ui/iconGrid.js
+++ b/js/ui/iconGrid.js
@@ -1172,7 +1172,8 @@ var IconGrid = GObject.registerClass({
             row_spacing: 0,
         });
         const layoutManager = new IconGridLayout(layoutParams);
-        layoutManager.connect('pages-changed', () => this.emit('pages-changed'));
+        const pagesChangedId = layoutManager.connect('pages-changed',
+            () => this.emit('pages-changed'));
 
         super._init({
             style_class: 'icon-grid',
@@ -1188,6 +1189,7 @@ var IconGrid = GObject.registerClass({
 
         this.connect('actor-added', this._childAdded.bind(this));
         this.connect('actor-removed', this._childRemoved.bind(this));
+        this.connect('destroy', () => layoutManager.disconnect(pagesChangedId));
     }
 
     _getChildrenToAnimate() {